gdk: Lookup both device and global cursor when checking up the hierarchy

When the pointer cursor is updated on CSW, lookup for either a device
cursor, or a global one. It would previously lookup for windows with
a global cursor, and then check if it had a device cursor, which would
skip windows with only device cursors set, and unexpectedly set the
global cursor.

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index e343e2c704fd596dc1c5faf9b817172fcf18132c..c66c8ee20418599e0b6d423277f4d6e8b7c2dc73 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -6891,6 +6891,7 @@ update_cursor (GdkDisplay *display,
   /* Find the first window with the cursor actually set, as
      the cursor is inherited from the parent */
   while (cursor_window->cursor == NULL &&
+         !g_hash_table_contains (cursor_window->device_cursor, device) &&
         (parent = get_event_parent (cursor_window)) != NULL &&
         parent->window_type != GDK_WINDOW_ROOT)
     cursor_window = parent;